From 41d019851c1583e490511c6abd27b8b6412d3dbd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Sat, 10 Sep 2016 20:39:07 +0200 Subject: [PATCH] wayland: Include generated sources from builddir, not srcdir --- gdk/wayland/gdkdisplay-wayland.c | 6 +++--- gdk/wayland/gdkwindow-wayland.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index bb1b78a6b4..db1c1d3aa9 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -45,10 +45,10 @@ #include "gdkglcontext-wayland.h" #include "gdkvulkancontext-wayland.h" #include "gdkwaylandmonitor.h" -#include "pointer-gestures-unstable-v1-client-protocol.h" +#include #include "tablet-unstable-v2-client-protocol.h" -#include "xdg-shell-unstable-v6-client-protocol.h" -#include "xdg-foreign-unstable-v1-client-protocol.h" +#include +#include /** * SECTION:wayland_interaction diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index d33de9bea3..82835b595a 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -32,7 +32,7 @@ #include "gdkinternals.h" #include "gdkdeviceprivate.h" #include "gdkprivate-wayland.h" -#include "xdg-shell-unstable-v6-client-protocol.h" +#include #include #include @@ -3253,9 +3253,9 @@ gdk_wayland_window_fullscreen_on_monitor (GdkWindow *window, gint monitor) { GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); GdkScreen *screen = gdk_window_get_screen (window); - struct wl_output *fullscreen_output = + struct wl_output *fullscreen_output = _gdk_wayland_screen_get_wl_output (screen, monitor); - + if (GDK_WINDOW_DESTROYED (window)) return; @@ -3293,7 +3293,7 @@ static void gdk_wayland_window_unfullscreen (GdkWindow *window) { GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); - + if (GDK_WINDOW_DESTROYED (window)) return; -- 2.30.2